Improve support for RDS