Finished support for simple injector (I think)