- [X] Improve default header computation