Improving API
Improving API