Update for RAC deprecations