Models with validations
Merge branch 'models/validations' into develop