Updated model validation