Added IdMap and IdSet generic bases