enrich  BiMap and FSM