Better support for optional automatic 'id' retrieval