Added support for annotated injection