Updates for 0.5