Add support for etag