guice handling improved