Added support for both static and dynamic content