Improve APIs