Headers refactoring