Headers refactoring #2