Added Navigation support to Builder and Runtime.