Add support for old format lines