Modify map to allow unions and add code to leader.Add tests to map