Improvements to API