Improve Guice injection