Add some classes and methods