Move to use GroovyShell