Add switch identifiers, return an association list