Feature/groovy script update