fixup! Create result objects instead of hashes