[#73692322] updated method definitions based on code review