modified database adaptors to more oo structure