Increment version
Moving content types and page types to seperate services, which cache results. Rename store to tree