Changes required to support minions