Remove toRow from package, and use Parser instead