More work on Graph implementation