Define parent activities
Rename activity
Don't leave the 'add server' option selected
Improve activity workflow when a new server is added