Updates to allow use of annotation service by controller providers as well as service controllers