Return dict instead of list