Better scripting support