So that PureChat/CC can work with new structure