Replaced the set for storing header values with a list