Restructure list populating mechanisms.