Update schema to include prefixes