More DI generic safety added to bindings