Use simple list instead of ordered dict