Added CalculateMethodsWithGenerics