Added scripting support