More DB access changes