Improved database.yml