Added extra properties to Property class