Add generics
Correct static access warnings