Added the last few bits to the specification