Updated creator to handle NSSet properties