Initial support for annotations (links, etc)