groovy support refactor