Tested and now we have fully standalone API