Improved headers handling.