started refactoring EntityMapping