Updated to use new DeveloperForce.Common package