Switched to use Spring (instead of Guice)