Adding union type, refactoring wildcard