-export type Request = [(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>) => void, (error: OCPPError) => void, Record<string, unknown>];
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+
+export const DiagnosticsStatus = {
+ ...OCPP16DiagnosticsStatus
+};
+
+export type Request = [MessageType, string, RequestCommand, JsonType, JsonType];
+
+export type IncomingRequest = [MessageType, string, IncomingRequestCommand, JsonType, JsonType];