Fix All calls + adapt with real api datas