Headers interface restructure