Added support for annotations.