Refactor ContextMenu Informationsfluss and Annotation