Prepare for CtxData
Port branches to ContextData