Use a BiMap for cleanliness