Guice rework