Modifications to accept oracle db