Add default to fields
Separate method for body validation
Rename validation functions