Encapsulation

Don't need synchronized map, the enummap is not shared across threads