Upgraded to Groovy 2.3