Added support for new classes and methods