Made diagnostics model neater