Added navigation callback system