Added WISHLIST for non-core features