Add dict for index_from_haves and index_from_bitfield