Headers refactoring #3