More API Improvements