rewrote Client and Timemachine data type definition with Lense style