And I agree this should return a mapping of key to the whole field dict