Updated the call swapper to work with classes and IDs