Added support for injecting features and binders