Align with latest should module