Added support for injectable Suppliers.