Add optimisation for dashboard