No more separate MasterNode type