Store use entity references and data entity resolver

Clean up Resolver::DataMapper and Resolver::EntityMapper and test it this time :)