Updated dummy client for better usability