[TASK] Improve retrieving distribution list