improve property validation & update generator schema