Added EPiServer support