Added some classes & interfaces