v1.1 Upgrade code changes