entity: moved data mapping from mapper to entity