Refactor for Play 2.1