Orchard 1.8 compatibility