Added basic RDS support and cleaned up initialization a bit