Switched to use Google Guice instead of the custom IOC