Added support for dynamic class names