More use of Guice dependency injection