Removed program property of FromDescriptor as it's no longer used
Changed FormDescriptor.apps to be AppDescriptors rather than Strings with app ids