- Polished up the annotation classes.
- Made it possible to create an instance of the annotation.