- Refactored API interface