Add some classes to public API