Small refactoring in Auth classes to better handle MccIds