Some changes to support Oracle DB