add initial diagnostic support