Scripts enhancements