Updated schema with feedback from @delianides
further updates