Added Generics For a couple things.