Record header refactor