Improved graph rendering
Fixed resolver ordering issue