Merged changes in FileClient
Converted all elements to byte arrays for hashing