Started to add diagnostics