This should a dict instead of an array