Add more db variables to ease configuration