Added MapEnum && QueueEnum