Changed core data model. Added properties.