Replaced deprecated Enum.first with List.first
Replaced deprecated Enum.first with List.first