Add Name handling for graph