header interface + structure fix