Update CLI to use latest DB wrapper