Refactoring around wishlist.