Added groovy stuff