Update to use new category API