Added timestamp
Added RawClientData struct
TODO: client cleanup