Updated with finalized reference implementation and spec.