Proper header ordering