Refactor of Guice to introduce strategic interfaces