Adds more robust matching on method