Move Database initialiser out of bootstrap

Change-Id: I934892874c6301c097a042c165e70a35815d6d81