Added support for basic categorisation.