Use correct execution context class