Added support for Always-on Annotations Mode