First commit for header expander