Assign script functionality and other enhancements