Finish off API handler