Adding DataId correlation so that database can enforce constraint