Adding diagnostics to Features