More work on ScriptingManager