Updated to work with Guice factories