[#3] Enhance Sug model