Updates for ts 0.9.0.0