Refactor to use the latest changes from navigator-injector-backbone-command-setup