Better script management