Updated for support Orchard v1.7