Improvements to API Interface