Improve scripting options