EntityMapper and CoreData API polish