feat(annotations) Add support for annotations. This is a merge with
master branch