Add basic support for RDS