Fix the models for Oracle mapping