Upgrade to 4.0.0 with new Pairable