Preformance improvements