Update to work with bevy main (and eventually 0.8)#111