Change way of configuring headers