Performance improvements. Salad 0.2.3