Updated to work with Play 2.2.+