Don't we want this to be a Mapping object instead of plain dict?