Updated to support play 2.1.0