Added wildcards, generic methods and generic parameter types