Updated according to changes in ProgArm 0.3