Changes related to guice