CONN-358/360: Modfied to scripts to make it more generic