Models refact
Validator refact