Added more attributes to Edge