Added Classes
Changes based of Unit testing