Updates to measure modelling