Fixing Execution plan API and Streams API