Api Improvements