[#] Incapsulation improvment