Added Genrics to methods