Added code for including diagnosed conditions