Updated some domain models based on latest requirements