Adding extra model validation