Switch from dictionary to list