Modified data structure for layer diff to be unambiguous