Refactored Property entity.