Upgrade to work with 2.1