Further updates to wishlist