New bimap implementation