Reworking for new Amazon RDS service