Updated for script libraries.