During graph creation, create eTable earlier

Not ready to merge - for discussion only