Updated to return dictionary with actual objects instead of arrays.