Added Database and configs everywhere