[fix] Make list instead of dict