More changes to support guice.