Updated for groovy