Upgrade to should 4.0.0