Improved navigation extensibility