add navigation support