+1 @massie 

Also, these fields should probably be wrapped by options, as the fields are nullable in the schema.