Updated category model