Add more hint and reference