updated schema with comments