Working on better scripting support