More refactoring for Play 2.2