Fixed header refactoring