- complete refactoring of fields validations