Changes to use interfaces introduced in Guice