Add Carrier class and tweak genre definition