First headers handling improvement