Removed UncertaintyType from the model. To be revisited in R3