Adding new unified schema (experimental)