Updated category data structure