improved support for groovy