Update spec for new types, versioning, clarification