Updated Category model