Revert to list for simplicity