added validation on some models