Improve SampleSQLBuilder support for journal