adding navigation support