Update for Play 2.2