Moved include/exclude column handling to conversion step, restructured header tokenizing