Added support for configuration classes