Added properties and database fields