Simplified event and discovery objects: one instance per container