Better handling for header analysis from terminal