Changes to allow for RDS