Bumped default number of properties to 30