ECL-295 Changed way the script is parametrised.