Add injection points and support for multiple scopes