changes to support dynamic headers