fixup! Use custom classifications (tags, categories, ...)
fixup! Add unit tests