Upgrade to version 4.x