Adding improved headers