Fixes #367 Allow custom annotation types (text-based only)