Added handling of client IDs