Removed warnings from Model classes