Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages