Improved version of WKWebshop