Improved the API