Added checks for the model on definition