Change from server to app json