refactoring headers addition