Added wishlist support