Update for sweet 0.4.x