Updated models and migratiosn to include categories and pairs