making changes to support Oracle db.
Interim commit.