Issue: 441 - Modify execute script, controller, and layer