Make it much more robust and allow retrieving the full object.