switch from maps/sets to lists in internal representation of an API