Heder refactor changes