Merge "Refactor server retrieval API calls."