Fixed flaws in schema with regard to v4 (Draft)