Addition of new classes and rewriting of some functions