Feature/self diagnostics