Added navigation using models