Add more code for wishlist notifications & management