Correct headers support