added more script support