Improve API
Improve docs