Add support for catalogues

Fixes #4