[TASK] Improve header