* Compatible with dict-revised schema