Further updates to Wishlist