Remove Factory and use Guice to inject dependency