Update ETag functionality (new Class and fixed a bug).