Added semantic navigation with smart-forward