refactoring to Play 2.1.1