Update data-model

Important Summary but need