Update to support RC versions