Added Groovy support