renamed exception class, added more to map different cases
Work in progress
integrated datasource manager
codebase used to migrate to java8 the production system