Fixes to DataMapperServiceProvider to move stuff to boot() function