Added BiEnumMap and test