Move to more generic list mechanism