Removing Oracle specific logic