Added support for inline annotations