[#55] Update code