Updates for 2.0.4