Add Groovy Support