Updates for 0.4