Added new version of ArmContext