Upgrade to should 3.x