Updates for gamma version