Updates for C* 2.x