Finishing touches to API refactoring
Finishing touches to API refactoring