Minor revisions to api abstraction layer