Move to HashMap (older version with List)