Updated for latest spec. Need to get openApp updated for new structure.