Upgraded for Play 2.2.0