** Scripting API improvements