Initial support for dynamic navigation