Updated for Play 2.2