Support CX refactors