DatabaseConverter introduced and StreamProvider simplified