guice related changes