Handle headers better