Fixed api and json