Added support for additional categories and actions.