Minor changes for retrieving objects by natural id