- Improved version of API