Improving the Joint Comprehensive Plan of Action