Adding Oracle functionality
Tiding code