Update for C* support.