SM-16283 Updated config categories