Adding some classes for the library