Add fields and validations
Add enrollment state machine