Changed CGMap to work with ForceMatch again