Improve api