Update for Orchard 1.8+