Server calls are now returning needed data