Adding some wishes to make the demo genie-friendly