Ab header refactor