Updates for Rossen's header refactoring