API Improvment