preparation for extending disco endpoint