So can we keep this for now ?

@bantu if the abstraction layer isn't able to correctly convert for Oracle we need to do it here ourselves.