improve oracle support