Changed Client struct back to public