Updated configuration and Guice instantiation to be more Guicy