Changed hard coded number of properties to param