Optimisation for data setting