(GOMClient) Added TODO.