add client_id support