With the map support merged, we need to have a consistent database numbering.
Faces support + extension will be 21, map extension is 22