Update according to happyplan 0.4