Added new framework with etag support