Changed from using type paramter into only passing Type as argument