Add forms and validators