Splitting out the db and vault views