Some changes in headers structure