Master/Slave/Config modularization