Added support for several classes