Further work on DB