removing MainDatasetRel from model plus some updates