Add fields and validations