Add validations
Reuse already existing model file