Tagged next-generation-infrastructure