Adding validator and form components