Refactored models and category setup