follow groovy client changes