Added ability to track current position in navigation