Switched implementation to use Play 2.1.1 Framework