Updated for Storefront 0.5