Updated APIs to better mirror server functionality.