More hdrs refactoring