Upgrade compatibility with version 3