Extended navigation examples and improved code gen