Update to the way categories are handled.