Refactoring the minion to support fighter too