Refactoring - Introduced OracleDatabaseModel