[CLEANUP] Use Generics.