Improvements in the API