Client architecture added