api navigation improvement