Added annotations for datatype/required/etc.