Move client_id parameter for client_index() into the Session