There is a new Genre field, allowing you to select as many genres as you like:

 

When your old database is converted, you can choose whether you want to continue to use the old Category/Sub-Category fields, or transfer the categories to the new Genre field.