Updating to support Orchard 1.7