Modified model & added new classes. [Early Development Phase]