Fix Bug 945018, add graph elements for signature on demand