Fix SingleRelationHeaderMap interface