Make use of RoboGuice and some minor enhancements