Better dynamic content handling