Refactored out of TC,.Sitecore.