Added support for more annotations