Use NavComposite where applicable