Adapted to Play 2.3.7