Updated docs and spec