Fix the models for Oracle mapping

/to @dashby3000