Further hdrs refactoring