Updated to work with Sitecore 7.1