Updates to handle ROOT scripting.