Update option map and add some helper macros
Update main node to use option map
Update control-worker to use option map