REmoved reference to BiMap