Add updated schema with notification awareness