refactor oracle connector