Add more output, prepare for SQLite.