Upgrade for AppD 6.1