Broke out SiteTree changes to separate file as it was break backward compatibility