Add fields, simplify validations