API Improvements