Changed method matching to be signature only