Database changes needed to support prefixes