Add support for dynamic classes and attributes