Changed Collections to use Generics