Wildcard refactoring