Switches from array-based gateway list to object-based