Added Classes and removed interfaces