Improve the get category/categories methods