ScriptHandler updated