Replace auto id with id generator, add etag and etag handling, more test.