Removed class, added new model