issue-22: APIs complete