Update to call separate apis