Enhanced the NavigationElement class