Added compatibility for dictionary-based lines