Header Builder refactor