Add generics for...something