Added edge descriptors too.