replaced operator_type with operator:type. shrank NGO key to ngo.