Work on category models and API