Updates to draft spec