Changes in how categories are handled, added new categories