Finish basic API wrapper