changed headers field type from Set to Map