Improve API
Improve API