[#72011282] Improve and add more API calls (fixed code review remarks)