Added support for CSS and modular expansion