adapted to interface changes in database layer in Oracle module (work in progress)