Added diagnostics + dump etc.