Refactor Oracle example