Major push to add attribute and fix for minor overlook case

FlowToDiagnosis still inconstruction milestone