Update Client completed and also removed dependence on Map objects.