Separating Master and Minion functionality