Added properties and build