Improve script management from client