Modified for Guice