Add RDS support to UAA