Hs guice changes