Using Guice annotations now... Changed to lookup based on keys