Added support for Sitecore 6.5+ (whoa: RC3)