Updated to support Orchard 1.7.2