Added more to scripting system