Changed Map Client as to suppress warnings.