added better oracle handling
fixed merge on oracle-handler