Issue #161: Optional features in the execution context