Right now we only support storage keys for whitelist_storage (maybe the macro already supports this, but for sure the benchmarking infrastructure doesn't support this). For a map we would insert the prefix of the map as key. In the benchmarking code we would need to start checking if keys start with the prefix and then whitelist them. This should be backwards compatible, because a prefix should be unique and not be used by anything else.