Cleaned up API to handle Control Scripts