Revisited goal diagrams