Adding Uncertainty and Units to Quantity Types in Software Models