Update feature: Minor refactor to minion module