Update for 0.24