Made some changes to account for deprecation of some of the oracle tables.