Added etag
Updated description
Refactoring