Enhancing navigation
Enhancing updatable entities