Add category and priority support.