Updated for play 2.1.1