Fix #10 - Update client to only include in the main class