Refactor watchers
Call existing validations from watchers.
Merge branch 'feature/ClientSideValidations' into develop