Tried to add logging to diag service.
Supporting more data types.