Update to new Polymorphic Navigator helpers
Tweaks & comments for polymorphic navigation