Changed primary key datatypes in data repository, stream cleanup