Dynamic content handling
Added some dynamic content handling