Added Client + Struct