Handle headers differently

Better method to handle header creation