Adding better headers