Call @OnStart before @Perspective to allow perspective definitions to be initialised first
(cherry picked from commit 701a6b3a3e0ee5e489041dd8ebe1b95a0e0679bd)
Add Map import back