Updated scripts to newer version
Updated code to use the new groovy based engine