Fixing merge conflicts
Allowing to use executors with algorithms