Updating to allow the categories to be dynamically defined.