Merged modify attribute changes with refactor of Script Task