Modelling enhancements