Abstracting wildcard out and other changes