Added missing properties definitions