Switched to Jukito and started using Guice on the existing framework