Improve the correlation betweens documented and existent options