Modified service to work with Etag