Headers improvement - lazy load.