Http headers refactoring