Added property mapping attribute.
Refactoring in the entity converter.