Changed client structure