Update to fit some oracle conventions