Update for new wasanbon spec.