Updates based on the Final spec release