Added changes to allow easier integration with Storefront