#44 Updated the types to the new Category class