Headers refactored to a special object