Updated the rewrite of the calls + added filter to catch when an executor...
Updated the rewrite of the calls + added filter to catch when an executor appears twice (throws error)
Updated the rewrite of the calls + added filter to catch when an executor appears twice (throws error)