Added more navadat options