Added new classes and interfaces, update of some classes