Update database layer to use newer database access scheme