Improve database.yml