Updated model components with uid attribute.