update for Play 2.0