Init and DB connection improved