updated model to cahnge some nullable properties to required