Updated with v2.0.0 draft code