Added some classes and interfaces