Changed Collections to use Generics

Updated lots of Collections to specify Generic Types