Updated to 0.8.0 draft