Improve the appearance of the annotation
Add support for macros
Port the selection section from the usage chapter