Addition of model name class checking