Updated Classes

Classes now extend Model