Fixed bug where edge-pair ordered differently causes NPE. Also added c
COMM as entity to key data