Changes to support Kata catalog