Refactor/extend csv header