Started to add new classes and interfaces