Update client to only include in the main class