Changed Groovy to 2.0 (up from 1.8)