maybe we make sure that this is always an empty map? rather than null?