Updated script handler and feature context