Refactor for Play 2.1
Updated to Play 2.1.0