Add DataMapper service which replaces ResultBuilderFactory and QueryFact...

Add DataMapper service which replaces ResultBuilderFactory and QueryFactory services