Added client validation to model order