Update navigation for a wider compatibilty