Patch to support AWS RDS