Some fixes
Some fixes
Add slave and master role in executor module
big commit