Updated to new Oracle API