Set id and version correctly
Add a query object