Adding in RDS features