Changed some models
Moved custom validators to separate file