Work on supporting SQL as well as U1db