Minor changes
Add new script to support goto action