- Modify public API to make it more flexible