Added some additional dynamic content handling