Support for the new CTP UI