HOPKINS: More rework in ScriptManager