Global removed on many places, rewritten to use incrementConfigEntry()