Peformance improvements.