Add ApiServer and saving to json files