Changing to guice