Added etag support possibly