Fix classes and documentation