Groovy improvements