Updated for AppD 5.2