Upated query section and add stubs for UmbracoHelper