Updates to definitions draft